Reconcile merge conflicts from before. Oops.
authorrobertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Mon, 5 Aug 2013 03:02:23 +0000 (03:02 +0000)
committerrobertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Mon, 5 Aug 2013 03:02:23 +0000 (03:02 +0000)
commitc292bd1cb66eb68625d4057ba9c6110f1fb8ed6e
treec5fb680065ede382742660578488e29a8160d0c6
parent4e2a279db854f9652e0d5a82ddfd6361542d69d7
Reconcile merge conflicts from before.  Oops.
gpsbabel/humminbird.cc